don't use AM_INIT_AUTOMAKE macro when we aren't using automake
authorSteve Langasek <vorlon@debian.org>
Thu, 6 Feb 2020 18:08:12 +0000 (18:08 +0000)
committerRyan Tandy <ryan@nardis.ca>
Thu, 6 Feb 2020 18:08:12 +0000 (18:08 +0000)
Calling AM_INIT_AUTOMAKE() in configure.in serves no purpose if we're not
using automake, and it confuses autoreconf.  Use AC_INIT() instead.

Gbp-Pq: Name no-AM_INIT_AUTOMAKE

configure.in

index 426669fb53152fc1e93eb09b7c1f2dbc95115028..10f75ab4f5ea4a66b5c9bb9198188b53c2ae8cd5 100644 (file)
@@ -26,7 +26,8 @@ dnl Configure.in for OpenLDAP
 AC_COPYRIGHT([[Copyright 1998-2020 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$Id: b9cf43515fc1cb3f6d884525dde92e60d857b5a8 $])
-AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
+AC_INIT([OpenLDAP],[$OL_VERSION],[http://www.openldap.org/its/])
+AC_PROG_MAKE_SET
 m4_define([AC_PACKAGE_BUGREPORT],[<http://www.openldap.org/its/>])
 AC_CONFIG_SRCDIR(build/version.sh)dnl
 dnl ----------------------------------------------------------------
@@ -69,7 +70,6 @@ dnl Determine host platform
 dnl            we try not to use this for much
 AC_CANONICAL_TARGET([])
 
-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
 AC_SUBST(PACKAGE)dnl
 AC_SUBST(VERSION)dnl
 AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)